Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code

[RRRRHHHH_Code] / ruralHouses client / src / gui / ModifyOfferGUI.java

diff --git a/ruralHouses client/src/gui/ModifyOfferGUI.java b/ruralHouses client/src/gui/ModifyOfferGUI.java
index 82efb8d..9259130 100644 (file)
--- a/ruralHouses client/src/gui/ModifyOfferGUI.java
+++ b/ruralHouses client/src/gui/ModifyOfferGUI.java
@@ -75,6 +75,7 @@ public class ModifyOfferGUI extends JFrame {
                this.setSize(new Dimension(513, 433));
                this.setTitle("Set availability");
 
+<<<<<<< HEAD
 
                try {
                        om = (OfferInterface) Naming
@@ -90,6 +91,8 @@ public class ModifyOfferGUI extends JFrame {
                } catch (RemoteException e1) {
                        e1.printStackTrace();
                }
+=======
+>>>>>>> 25898b619dd708c9f15a44200b545cac11404b73
                
                jComboBox1 = new JComboBox<RuralHouse>(Hlist);